From 3efccc2597f2c8692de6839922b13c786e4ec9d5 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Mon, 18 Feb 2013 00:26:38 +0800 Subject: [PATCH] * net/rcirc.el (rcirc-keepalive): Fix invalid timer error. --- lisp/ChangeLog | 4 ++++ lisp/net/rcirc.el | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 58e74a3951c..d51e13321e1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2013-02-17 Leo Liu + + * net/rcirc.el (rcirc-keepalive): Fix invalid timer error. + 2013-02-17 Glenn Morris * menu-bar.el (menu-bar-tools-menu): Fix case of EDE entry. diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 086043c2b4a..7c70ded3eaa 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -625,7 +625,8 @@ last ping." (rcirc-float-time)))))) (rcirc-process-list)) ;; no processes, clean up timer - (cancel-timer rcirc-keepalive-timer) + (when (timerp rcirc-keepalive-timer) + (cancel-timer rcirc-keepalive-timer)) (setq rcirc-keepalive-timer nil))) (defun rcirc-handler-ctcp-KEEPALIVE (process target sender message) -- 2.30.2